From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 29 Oct 2019 13:13:38 +0000 (+0100)
Subject: padOsd: Work around xgettext confusion
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~492
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=db9249a1b7d23bd2e44a0eb1d93b82576ce0f3ea;p=gnome-shell.git

padOsd: Work around xgettext confusion

Similar to the previous work-around, xgettext gets thrown off by
embedded quotes in template strings, in particular where a template
"breaks up" a pair of quotes.

Throw in some more comments to make xgettext happy, but whoever makes
the gettext toolchain not depend on fragile regular expressions will
be drowned in beverages of their choice ...

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/792
---

diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index b36c00b48..edb4fbea0 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -350,7 +350,9 @@ var PadDiagram = GObject.registerClass({
         return ('<?xml version="1.0" encoding="UTF-8" standalone="no"?>' +
                 '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" ' +
                 'xmlns:xi="http://www.w3.org/2001/XInclude" ' +
-                `width="${this._imageWidth}" height="${this._imageHeight}"> ` +
+                `width="${ // " (give xgettext the paired quotes it expects)
+                    this._imageWidth
+                }" height="${this._imageHeight}"> ` + // "
                 '<style type="text/css">');
     }